Updated/New Composer support for DBA

See diff for full changes