Added timer compatibility in POC --