added support for validators, removed dependency on toolkit
making some updates