Updated Schema