Updated build definition