Few updates with relative file imports