Simplified the imports as there is no name conflict anymore
Added some doc