Add bunch of improvements on prototype