Add working version on  fake "classes"