Fix build, import only required data types and constructors