Updated/New Composer support for Benchmark

See diff for full changes