New version to fit composer needs