Added code for UI/Server and ETL