Switched completly to By-Expression 

I think this brings a better performance, cleaner code and more flexibility.

Signed-off-by: niels <opensource21@gmail.com>