General class moved to external lib. Not sure it's a necessary.