Refactor definition access