Use Long as return type since long is expected