Improved extensibility