Performance improvements @MaxReimann