Fix #21, move validators into connection for now.