Huge package of changes and new features