Additions for the next version