some layout changes
Changes in LinkedMap passing implementation
Changes in LinkedMap passing implementation