Migrate to using default aspect and bladeset