Added new features to sample project