Refactored the perfomance structure