Refactoring derived quantities