Fixed object map, reworking selfpub model