Updated/New Composer support for DB

See diff for full changes