Added code to support slots