Better support for ui-router