Tring to resolve circular import dependencies