This will be implemented in the next release