Minor refactoring of attributes handling