New class with validation
Merge branch 'version-0.05'