Is there a reason we need this properties at all? I think we should just keep this all internally.