Separate attributes and properties

we can't handle attributes right now.