#1515 | Added drug related models