Modified application structure