Add proper support lib