Changed dependencies for compatibility with felix