Now handled persistence and validation