added struct internals