Minor changes

Added accessing methods, renamed class