Added placeholders and various other changes