Added dynamic routing awesomness