Added some parsing logic