Sush | #2105 | added some more validations and packaging