Some optimizations to the refactored base