Refactored validation and platform step