Added user, family and executeQuery controllers
merging