[FIX] Fixes and added fields