Bug fix and Feature Enhancement