Adapted library to AS 0.5.2