Adding component registry stuff