Changed route structure to allow for more flexability