Fix versioning and simple importing