COntinue add options for entity of computer entity. references ##2470