Add is_valid? check
Create stubbed handler