Updated to allow for new options