Added fix for issue 14

Issue: Re Design DAO layer.