Started working on Authentication Data handling