Updated to fix object instance access