Database / Router

Bug fixing and additional model cases to extensions