Added function manager and checking of entry function