Updated/New Composer support for RDF

See diff for full changes