Added some pragma statements and changed the data type of a singleton method.