Added short-hand module imports (from x.y.z use a, b, c)