Updated/New Composer support for Validate

See diff for full changes