Improve access to allow for nil set