This was possibly a slightly cleaner interface before - but I'm not sure I would change it back.