removed Layer Class and fixed POI adding