Renamed Extension, added comments