Moved property map values into it's own class.