Add shortcuts in entity definitions
Add migrations