Add Database sandboxing and update Annotate Models