Add PathLocator
Add Layout support