Improved definitions.