API enhancements. calculation efficientcy