Updated to use composer