Added more placeholders, fixed namespaces