Putting proper schema in place.