Add new features and sample