Preparing for more Stormpath features