Added setter and getter methods, fixed interface