- Added validation