Updated feature to include full specification