Reworked requirements to resolve version conflicts