Improve manor module