Various changes
Working on Composer support