Add multiple layouts support