Commented code meant to be implemented in version 1.1.0