(COMMIT-21) Address controller