Added routes to comply with Sol's proposal