Introduced Activity mapper and integrated into index controller