Moving validators into Map

Resolves #23