Improve auto layout support