More updates come with 4.0.0.rc1