Added even more mappings.

Need to make up for not working enough in the weekend anyway... :)