Add option to include lifecycle - Fixes #2