Added running support