Updated from stormpath