More features for GUI