[FIX] Serving side handling
[FIX] Client side updates, database changes