Updated to fix imports & code errors