Add six module & extra functions