Fix routing and uses