Feature/better cdnify