Added field helpers and better argument handling for nil