Fixing NPEs in validator
Using a custom builder to support advanced use cases #342