Adding more lazy loading methods
Finish last trigger api commands