Added util methods and authentication