Fixes and added validations