Add archived attribute for much better structure