Continue working on validation