Feature/refactor 6.3