Added currenttoken to Directory to support custom back button handling