Adds extra layout support