Made token optional