Directional bug fixed in user namespace. General refactoring