Add z_location & changes to initializers