Change architecture to hide non api methods