Moved to calling lib directly