Refactor create to new in Context to prevent confusion