Added experimental custom semantics