Update functions structure etc