Fixed import declaarations and deprecation attributes