Added UUID method and made other changes as specified