Changes to generic and contact