BUG-592: Migrate users to new build() method