Improve advanced use