added custom attribute handlers