Adding features to be implemented