Fix path to basic layout
Add entities parameter