More improvements ... adding memory pool