Better add subscription + more shortcuts
More error handling