Add last play support