Improve elemental build file