added more framework functionality and entity framework