Added a feature
Minor fix for validation
Features and more