Added support for raw-attributes
Added composer support