Added gui support