Update the code to complain with the latest approach of Skue project.