Added functional registration