Updated with classes