More work on MPD layer