Added contact field
Cleanup