Support for score and other minor enhancements