Move AddLib macro to seperate file