More smap editor changes