Correcting imports and implements