Misc. additions