Moved input validation to creator

Moved validation from top level to creator as it makes more sense