Updated to work with barnowl v0.4.x