More work on Lime library