renaming a couple of things for better readability; added "extra" property for routes