Optimized the operational functions