Refactor built object interception