Adding layout and HBS support
Adding layout and HBS support