Major changes and extensions