Initial focus support added