Framework improvement, version 2.1.1