Refactoring
HandSeparator class added
get map methods added to context