Restructuring code and changing security readers to the correct functions.