Updated build functions