added registry & removed old interfaces