Remove penalty factor for server processing, add measurement based severity model