Feature/custom areas