Move more attached properties around