Changes for CrossApp

Changes for CrossAppq