Review changes
add more helpful utility classes
bugfix in utility gap classes
prepared new contact structure