Adjusted structure to match pub-requirements