ADBSchema refs refactor