Refactor attributes
Better, more dynamic and simple resource handling