Added rendering and options parsing