Tags code is fully moved to lib