Updated build file to be more generic