Adding the updated version of the SDK with better expand behavior