Refactor embedded entities
Allow customizing field labels
Update assets