moved attributes to its own branch