desing + refactored to controllers
extended analytics service