better integration support