Changed id paramters to Long