Added ensure where appropriate