Updating for compatibility with latest Droidel