Added support for database fulfilment on parsing