Use mass from config files and update comments