Fixed issues with previous added API