Feature/zfc user