Enhance redirection field and other stuffs