Changed class to not conflict