Fixed custom routes. Core functionality up