Added validation, persistence and test data.