Unfinished changes (artifact handling refactor)
Unfinished artifact collecting refactor