Add an option to skip disabled objects