Improve intent related methods