Changed routes declaration to new style