Another attempt at solving circular import issue