Added validation and responses corrected