Move Embedded to its own class