Updated imports and references
Released 5.0