I am not entirely sure. Lets address this in the other PR #300 where this is refactored any way.