Basic Perfomance enchancements