Implemented AutoMessages. Resolves BS-10.