Added Users framework - without database