Additions to controllers etc