DEV: Add headers and lib