Updates for better integration