Map strings to objects
Use nicer syntax