Added option for external access