Fixed model to use new naming conventions and traits
Modified validation listener, added validation dependency