changed to use Registerable