Someway to working file validation
Also model has a proper extend method now