Some updates and changes about module

Maybe, i can write module again if needed.