Fixed missing imports and added strings