Updated/New Composer support for Validate_FI

See diff for full changes