Added comments to all classes and fix the Search by Name