Feature/rbclassload2