Improve support for Devise