Fix scope and add since