More work on revised model layer