Added where-macro and started using it