President Barack Obama is including a proposal from Sen. John McCain, his Republican rival last year