refactor builder/manager access

refactor builder/manager access