Implement Done support