Added objects for real, mapfiles will not work in this version though