FIX: Contact Refactor