Got mapped properties to work for sub properties