Moving Attribute functionality into separated repo