Moved some functions to child