Removing dependency on validator