Some attributes refactor, strings reordering