Added redirect service;
Some fixes