Some import optimization and updated dependency versions