Add classes extraction