Some changes to include mouse mapping.