Added some more helper placeholders and classes.