Minor modifications
Factor bind_class