Fixing dependency hell