Recreated some vanished classes