Minor revisons to function registration