Move more options to generic method