Added menu support and samples