Added all the required methods