added hinting and routes