Build conf refactor