Added basic code for routing handling