Enhancement to Theo conventions