Updated to add all methods to be used in SDK