Removed placeholders and added createdby