Add the rest of the needed functions