Add more usable features