Added indexes and some controllers