Finished refactorings after reworking for new way of attribute declarations