Changed id to Long