adding support for dedication data-type

and fixing handling for foreword data-type