Fixing naming conflicts and updating Forward
Updated version and dependencies