updated all to return semantic info