Updated d7 core lib changes