Added better rendering capabilities