Added features to be implemented.