Finish optional methods