Make API a bit more GUI-friendly