Restructure push extras and add expiration