Contactable add and job add refactor