Feature/inclusion of PoI