Some more changes for integration