lazy load fix for issue 88 and some additional methods on controller