Added full devise support