Added rida and route classes