Feature/fix all those stupid extension classes