Refactor java core
Update Routing helper