Added more models and enhanced Member model