Fixed specs and added predefined mapping support.

@dennisvdvliet