Fixes Issue 28: Adds a way to include custom partner preferences