BindingsFactory introduced to get rid of static variables, some errors corrected