Added data fixtures support and fixed contact columns to be nullable