Finalize implementation of analytics engine