More Integration related changes