Added calculations for various types of aspects