moved from Model to Map so we do not use a Spring-specific class