Adding required fields to arguments' check