Prepare for more development