Updated to work with dev builds data