Uodated to SDK 7.0