refactoring => some more webapp mappings