Continue initial implementation