Making builder version less restrictive