Added some helper logic