Added features to implement