Update to work with current composer