Added the required function definitions to the needed classes