Switched to use six module
Added six module