Refactor/indonesia layer