4.1 Added missing getter/setter implementation.