fixed imports and super issue