Base code preparation for next version