Added metrics & versiob system