Optimized imports. Fixed build.
Fixed NPE