Feat: settings

Split update method to two. And handled couple
@papricek comments.