Removed restriction on only using classes