Added custom button support