Class moved to better place