Smaller libs and support adding function plot