Feature/embedded for composite primary key

Share the feature branch