Reverted back to using operating system instead of os family