Added 2.1 features and bug fixes