Added more optional methods