more attribute refactors