Added imports and restore names