Added more optional stuff