Improve Custom Construction