Added UI-Router support