Modified to be manageable by Composer