PS-11 Moved measurement logic to strategy pattern