Logic: some fixes
Implement front service