Repackaged and added necessary imports to get everything compiling