Refactor java core
Update routing helper