More placeholders and changes to the structure