Updated build scheme