Improvements and extensions