Use Long instead of Integer everywhere