Added finding and user controller