Added z-index support