Removed key counter from validator. TODO reimplement working version