Implemented new metrics, filters and improved somethings