Added placeholder support