#403 Moved lazy defintions