First try of keystone integration