Performance improvements, better initialization