Various updates (removed events table)