Fix resolver syntax errors
Move more business to builder