Added getter/setter to avoid compilation errors
Updated to reflect recent changes