Updated/New Composer support for File

See diff for full changes