added registry and some exceptions that it might throw