Moved metrics inside the webapp