Improved external clock support