Resolve #2 - Builder