Yeah, we should probably stick to the existing interface though.