Refactor builder to allow easier addition of other languages