Some changes to include mouse mapping.

For you