Added extra info (need to complete classes)