Fixed cyclic dependency
Better validation and initial autocomplete support