Minor refactoring and improving support for active model translations