Handling contacts

Creating choice fields mapping and methods to use it
Adapting contact methods to get better responses and handling new reply codes
Refactoring some method signatures