updated work schema for better filtering