Needed: More rigid slave definition mechanism