Added new options and methods