Removing timer. Adding support for ALL attach point