Implement missing functions