Adding proper structure