Fixed to comply with refactored dependencies