Adding geo querying, improvements in classes naming