Adding features and sample code