Added timer, layer class