Fixed duplicated classes