Added: more spec implementation