Added boost support and updated methods using boost