Clarified class names and added some methods