Agreed - I just tried to maintain the same methods from previous implementation, will update on next forced push.