Updated Models to be more dynamic