Started to add superficial liberty support
Added full liberty counting support