Add @Factory annotation to methods that require more context sensitivity

See #6.