Improved custom builder lookup (issue#6)