Improve album module