Better performance (using indexes)

See #8