Changed Boolean from Class to Module