Add handling for opacity