split up more things into Extension classes