Updated to support composer