Adding field set wrapper for other framework support