Adding LiveView support