Better documentation, added filter and more