Optimize this class