More Refactoring
add guardian details