Add missing imports
Added some logging
Changed api target and removed unused support lib