Adding persistance and udpated schema classes.