Implemented parts of Analytics