Moving builder code to a separated file