Add add delete and validate
Merge branch 'admin'