support for redirection properties
refactoring, cleaning