Some updates and begin new framework