Moved validation stuff around to free object namespace