changed @Embedded classes from nested to stand-alone