Add better integration support