- Added validation steps