Additional improvements to base